GUI-200
updates per Jenny's feedback
merged from develop
Merge pull request #88 from eucalyptus/GUI-200

Gui 200