some design fixes
Add: quotes