* Minor UI Changes
* Internal Code Optimization