Merged changes from Qirion branch

User messages and display options.