Improve SF menu