merged mobile and desktop into web, added dashboard