Updated with view, delete and a few fixes.