Cleaned up button interface