Fixed action factory and updated display classes.
Merge remote-tracking branch 'origin/master'
Fixed David’s SH!TE