GUI-1199
updates to match wireframes
GUI-1199
updates to match wireframes
Merge pull request #868 from eucalyptus/GUI-1199

Gui 1199