Updating to fixed layout with basic heist templating