More control button styles and code cleanup