More work on updating to new look