Fix subtitles and minor bugs
Merge remote-tracking branch 'origin/grar-mvc' into grar-mvc