Add some content and improve layout