Moved UI and UIButton to seperate files.
Removed dead code.