Fix commit based on feedback
Nicer position for button, move gmg code