reorder UI little bit