[#688] Adds loads more blocks around editing/adding dataset form
[#688] Moves endblock to correct position
[#688] Adds more blocks into some package snippets
[#688] Adds more blocks around dataset listings with search forms
[#688] Small logic fix in template