Rename some variables
Smaller buttons
Remove border from controls to save 2 lines.