Fix navigation + add new charts