cleanup and better menu effect