Updated Settings form

Fixed the Settings form and centralized some functionality