Added message for when no data is available; reorganized templates