re-organize css and try update message style