changed setting view layout and fixed a few bugs