Users app added and templates integrated