small refacto
setting form draft
more settings logic
basic settings OK