#2 fixing screen detail by arifs27