put loop in menu and fixed formatting