Change admin layout; reorganize templates