Bug fix for swing and amended PR table behaviour