Loading animation…minor bug fixes