Various improvements + admin part