CSS - some small optimisatons
config reorganisation