Moved several of the html helpers and general component helpers
Proceeded with real estate
General bug fixes