Clean up user controller-model relationship
Add assets