Layout fixes and improved example