Added buttons, made some tweaks