UI review & improvements
v0.2.2