Updated manifests and moved menus around

This requires some testing on Android and Windows before submitting it
to AMO.