[master] Fix fit screen