Couple Bug Fixes between the tablet and phone