Improved layout template