added menu/preferences user logic
merge conflicts