Add fix for missing screen size space
* Reformatted code