Minor fixes. Trying to put mobi-router in desktop
merge