Making some changes to match the style guides. Also added the propossed layouts.