Kasperp angular react rebase and improvements