Take out design into styles
delete hardcode & done style for layouts
Merge branch 'feature/sixth_styles'