Basic layout changes, but are pretty ugly. Need to fix code and do proper zooming