added one more and some fixs for small viewports