Cleaned up UI and added more functionality