Changed styling of buttons and more work on commands