Merge changes with Francs and updated cutdown css.