Switched it all to group layouts, looks good