More formatting change

Some updates in the format. The content still need to be updated.