Fixed bug and changed overlay