CSS magic added
Merge changes