file cleanup and settings menu structure update