Code Cleanup: GUI elements