Fix backbutton in config router & cleanup