Fix layout issues. Update menu.