Added admin static and changed some templates