Modifications css + html
Merge