Remove aggregate values from indicators

Also added a top navbar and simplified some code.