Fix for swift_hash error + small gui fixes