Change menu style and some fix