Fixed #68.
And reordered buttons
Todo: remove duplication