Made the modal views work