Cleaning up the UI & building functionality