fixing nav, button transitions