UI, Code Improvements