added some chapters + some layout to make things looks better