Removed all warnings.
Cleaned up button code.