refactored, fixed -table for 8.1, still need to find navigationBar