Tidied up fade-in-outs for less code