Placement changes
Merge branch 'refs/heads/dev' into preview
date and colour changes
result screen