Fixes #546

Fixed the issue #546(Refactor ModalView templates to use Jade inheritance)