reviewed
reordered
Merge pull request #195 from cloudify-cosmo/ui-fixes

These pages need more work. We can get to this soon.