Fixed paths and removed Screen