Creates a Rows item too now

Plus some cleanup