Added a few controls.
Minor HTML layout fixes