Fixed some bugs on smaller screens