updated designs and copy
merged design and backend
merge fixed