button fixes and overlay fixes