Thats better…. cleaning up UI/UX