New text on colour page
Re-jigging the upload photo page
Merge conflicts