Clean up and renaming UI components