Improve Logic and ViewModification routines. Small fixes.