Reverted to nav and pills