Update to new look and feel