added buttons, and replaced navbar