Minor Small Screen improvements