* Minor UI Update
* Internal Code Optimization