Fixed action display
Merge remote-tracking branch 'origin/master'
fixed get
lazy bum