pulling and ui fix