Update design
Update design...
Resolve conflicts, small fixes