Added loading indicator to the ListView. Made some code cleaning.