Added line
Remove extra line
Remove menus & some modify