Unify the ui a little bit