buttons and some fixes
buttons