Improve UI layout
Release 1.0.1