Fixed some layout
Release 1.0.4