* Minor UI Fixes
* Internal Code Optimization