Organizing Elements and fixing missing partials