Made the UI more clear