Removed unused UI elements.
Redundant newline
Merge pull request #375 from jammm/master

Removed unused UI elements. Issue #367
upstream commits