big layout change, add some buttons and stuff