Buttons look nothing like design

The rest of #8