Changed layout and buttons to use bootstrap