Routing fixes, initial template