small UI fix , full testing