fixed some issues related to mobil app