Fix bugs on big screen