Working on polishing up the UI