Fix Menu lag

Find new component for the menu and fix the selection component