Added separate widgets for the modal windows
Merge pull request #1 from Coenego/avocet/modal-widgets

Added separate widgets for the modal windows