Changed delayed job settings. Fixed minor view issues.
Merged latest; Resolved conflict.