Fixed

• Reorded settings view sections
• Minor bug fixes