Added layout

Still needs some beautification.