Updating layouts
Improving examples