removing unneccessary imports
adding mobile desktop support