added unsemantic grid, split views into more partials, began new layout
fixed merge conflict for authorization callback in app controller