Fix backbutton in config router & cleanup
Merge pull request #604 from knownasilya/config-router-back

Fix backbutton in config router & cleanup