Further development on basic layout and started adding content