Fixed testing issues and added fade to image transitions