fixed width issue for the controls (noticed in firefox, had to do with
font size)
code reorganization