Included changes for different screen resolutions