Added various minor fixes + split admin pages