popupp menu branch

to be merged