Firefox height bug fix + small corrections