more work

Fixxed buttons