Changed controls to buttons for consistent look and feel.