Simplify ui a little