fix identation, component names, add props type and made some changes so the code have the same pattern
