Cleaned up syntax for buttons