Design changes

Minor style changes