Fix broken setting, and a few arrangement