Cleaned up the Locker drawing a bit