Use fully qualified namespaces, minor fixes
Clean up the setup page