Refactoring, cleanup codebase, implementing new html grid factory.