Fix for problems with new layout

Problems identified by 'Intrinsically-Sublime'.  See discussion on issue #338 "New layout":