Bug Fixes for tablets