Display property in wrong div
Merge branch 'dev'