Fixed the modal problem for good. Bloody bootstrap @.@

Closes #164 and #163

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>