Some fixes and add last missing pages.

Also commented delete function on storages out, as this will part of a future development.
Add missing template