Some improvements

Added spacing, and text to mode button.