Added button controls, text on buttons not implemented yet