Fix sub-menu bugs
Update manifest