Move menuitem to top, add more folders