Layout/Tab updates

Including Merle’s stuff