Fixed test failing on Travis
UI Improvements