Added overlay
Bug fixes