fixing small bugs
working on menu