added modal + menu fixes