added last changes on UI again