Sprint 4

Design update