Reverting to modal for comments + refactor comments controller and added custom handler of backbutton events to close modal if open