Fixes on running screen