committing bug fixes for tablet and android