Updated button styling and fixed controller bug