Updated deprecated code in notification view & cleaned up code