Working progress...adding nav and results