Improved Contact view Else cases better