Manually merged in Elan's UI updates, all credit for these changes should go to Elan :)