Cleaning up UI
Organized code :)