adding some padding and rolling back some viewport hackery