Final Final commit

Added fix for tablets