Fixing some of the module view problems to get things working