logo position fixed
merge commit