Working on cleaning up the UI