Add further improvements to the example layout