Some work on the tablet layout