Fixed status message position
Fixed demo popup style
Merge branch 'dev'