Design Fixed
Design Overwrite
First Patch of adjustments
Design + Friendly_Id
Merge branch 'feature/design' into develop