Design improvements
Merge fixed