load bug
window height fix
merging changes