fixed batch 3 ui issues