fixed autolayour issues different 6 & 7