layout changes; removed redundant code --KW