Code cleanup, removing stu's insane grid layout code