Fixed Bugs with Modal