Add buttons section and move over stuff to it

Change-Id: I3024f2113d943782db9d06eec80fffc1a16d323d