Tablet fixes and UI improvements