Refactor
Merged design changes with backend changes
Refactor
Merge with u Julie