Improve UI design
Merge with master