finished layout mods per gabe