Formatting + changed to type to modal