Added preliminary validation, tweaked main- and adminpages