Updated namespaces
venue pages and refactoring