Added menu sorting and active items