New Templates for Apps & Services & Image Modal Fixes