Fixed some small case clippings in tablet
Merge branch 'feature'