Fixed bugs, updated crud form, updated crud grid