Settings app, reorganize templates