Fix folder view and format code