Removed unused argaiv field. Reshuffled buttons to fit better.
removed extra space
Cleaning up formatting.