Added in buttons and fixed up layout