#123 simplified to a single template and add a layout button