Some fixes. Problem with vertical navigation.