Collapsed border.
Merge branch 'redux' into redux_test
Renaming routes.
Merge branch 'redux' into redux_test