added a few more things, basic layout