Beefed up layout