Minimal refactoring

- Better location and style in buttons