Menu Items directives; various design changes