Adding some controllers, namespace fix in viewport