Ux fixes

It would be better to do this inside Ember.run.next(function () { ... }) rather than manually setting a timeout which would be prone to race conditions.