Layout + Javascript updates

Fixed performance and year 1 table. Totals for everything except comp
annual