layout changes as requested by emanuel