re arraged menu stuff