Improved some labels