* Internal Code Optimization
* Minor UI Fixes