added layout, buttons and stuff.