refactor && wider menu