Reorganizing table view, fixing 0 warning/critical bug