Starting some cleanup on the UI code