Sprint 4

Update design