Added a menu item to manage modules and minor fixes