My improvements for the ElefantCMS