Fixed some bugs on small devices