Adjust buttons, change css styling
Merge