moved around some of the ui components