Minor template / style changes