Addnl changes to UI