menu function moved to own class
save content fix