Fixed routing and rendering - works for all pages