refactored templates, re-formatted lists, added wating msg