Kicked ms from advanced settings
Merge + modified ui