templates + improved admin