cleaning up ui a bit