Update nav; update layout; add tables for counter stats