made it crisper
Resolved Conflicts
Refactored the design