Reorganize bit the UI