Finish layout & routes - FIX