Cleaned up buttons/labels