Merge pull request #170 from theforeman/ui

UI improvements 2