Couple of enhancement on stylesheets