Layout revamp