Relocated the Add/Edit listing form to the sidebar
Fixing merge issues