Refactor CSS a little bit