quote and layout tweak