small fixes, new popup ui