Navigationview refactored, commented and close method added
Emotionwatchcollection view refactored, commented and close method added