fixed more issues for smaller screens