Module cleanup and css fixes