Moved modules to appear on main page, misc module bugfixes