Invoice UI improved