Fixed Overlay Issues