Fixed routing problems and made it inherit the main application layout