Remove tbd, slight restyle of controls