Added modals and updated html layout