Fix template and styles