11/13/14

Added changes based on Visual Designer's style guide