Merge fixed, now improve summer alignment

Improve summer alignment and fix document layout