Updated to include modal, styles and checkboxes