Added uploads and updated layout and cms