Switched basement to new image drawing and fixed borders