added last changes on UI