Routing, linking, tabs, style, etc added