Fix old deprecated attributes in layout
Fix old deprecated attributes in layout

iiordanov/BSSH,alescdb/connectbot,connectbot/connectbot,iiordanov/BSSH,lotan/connectbot,kruton/connectbot,connectbot/connectbot,kruton/connectbot,connectbot/connectbot,kruton/connectbot,iiordanov/BSSH,alescdb/connectbot,lotan/connectbot,alescdb/connectbot,lotan/connectbot