Finally... the table view looks nearly final now