updating to fix layout issues
Fixing conflict
FIxing issues around uploads and the layout when editing a new page