added filter to dsplay menu by role
solved conflict in layout
fixed bug in layout