Fix wmpl size and z-index bugs