More updates on UI