more changes in support of Portrait mode