Feature/fit to screen

please merge this