Adding additional module menus, fixed various bugs