added loading icon, background and changed some templates