fixing buttons
Merge branch 'new_structure' of github.com:benheb/mapash-js into new_structure
fixing conflict