Moved Menu Code And Optimised Them