IDI-104: Clean up main template