Mod select dialogue updated & few fixes