Several updates to design and content