Small viewport tweaks