put controls in their own divs and fix spacing