Refactory nas views