Corrected admin page display + minor changes to error pages handing