Added sender object to views
refactored sender object