Re-arrange container drawing a little