Added buttons. Still some bugs