layout menu improved
conflict fixed