Fix style, buttons and new SCSS