View files fixes, recovery fix, edit.phtml fix