added navigation, tweaked flag