added components
did some HTML re-formatting and text changes