Code Cleanup and UI tweaks