Working on view and comments