Fixed issues with displaying on 3.5 in screens