Added masjid to screen; refactored