Merge branch 'design-update' of https://github.com/EverythingMe/gaia into design-update