bug fix 1 and tablet view