Buttons improvments and some js fixes