Started to optimize the UI

not finished yet.