Fixed some bugs on tiny screen