trying to fix mass-assign problem
fix conflict
added navigation + style changes