buttons tweaks and bug fix