Add buttons, make sidebar, update grid