Big updates to design prototype