Get the layout working
Change references to the state as button state