More menu animi and cleanup