more tweaks on buttons and header