Make ui more consistent