Fixed some bugs, including modal background shift