Fixed screen overlapping issues (Bug re-emerged)