Layout changes requested by @igorw