Added a topic, cleaned up menu