Final stylesheets improvements