cleaning up the ui a bit