[#665] Put button bar in its own row so we're sure to clear components