Completed Layout for review

Version alpha 0.1