Rearranging padding a bit