many structure and styling updates
major structure updates