Add buttons, improve layout
Remove bootstrap