Revised app routing