fixed a lot of small bugs from Ella Admin shared document