second commit
Finish basic layout