Cleaned up display and CSS of buttons a bit