changed the layout a bit, and moved some functionality to other pages.