More testing
Screen size bug fix