Final fixed before release
Fixed resolution problems on some devices