Fix routing, content tweaks