Added Modals module
Fixed Discussion module