Reorganize settings / implement new ones