Fixed the overlays

Change-Id: I75dc87c184739f91d19e6a94cf87b78637e2fb43