Fix for #46 and partially #51 - modal windows based on Bootstrap