Alignment fixes on small devices