Updated look and feel