Dashboard layout (not styling) and some routing/user-flow changes