Improved CSS and graphism
Resolved merge conflict