Visual improvements as per the e-mail
Fixed merge conflicts