bug fixes and tablet layout