fonts added some bugs fixed and css js mergers added