clean up nbsp usage and fix table spacing isseues