Added messages to the view
created partials
fixed merge conflicts