Finished layout
Release v0.0.7