refactored + settings menu

test