More work on plotting mode layout