Fix #167 Improve tablet UI