improve mobile nav logic, code refactors