Improve menu components