Alex - Some ui modifications