added bootstrap-collapse, structure and styling changes