Table ordering, view cleanup