Issue #34: Small screen improvements