GUI-187
incorporated feedback
Merge pull request #50 from eucalyptus/GUI-187

GUI-187