made more modal views into components