Clean some code, ShellView has issues

ShellView  will not display folders correctly and I think it was not
because of my changes