minor changes, navigation buttons