Simplification and consolidation of files, and edit of css