Added menu, cleaned up stuff