More work on desktop/tablet version