Some fixes. Add settings editor