Improve CSS + remove unused vars (issue 6740)