added fixes to overlay