refactoring, change menu lock while tracking
fix achievement icons