Added Grid and OneTopic, cleaned up