UI Updates and Code Cleanup