Fixed RM animation, better menu org