Buttons finally in the right place git st