Beginning to Clean Up UI