View changes, add shared partials
messing with ui
resolving conflicts