Differentiate looks good from nitpicks

Removed some white space and added a long if condition to differentiate looks good from nitpicks. 

One refactor I could try to do in the near future is extract a notification presenter. It looks like we 
might need one as this code base grows. 

I did not use a case statement in the view as I really dislike them in views.