refactor layout names; revise mene xml