Changes to layout and first basic prototype