[Fix] Rangement the contents