Improved layout code
v0.0.2