Model fix, new buttons

Buttons need fixing