Updates based on current UI
Merge pull request #2189 from thinkingserious/patch-4

Updates based on current UI