More Bootstrap structure and modified forms in preparation for client side validation