FE :: Reworks routing logic and code