Adjusted settings panel, fixes, cleanup