update content and minor alignment