updated machado, tweaked nav size