Merge branch 'hotfix/0.3.2'
More intelligent display of just watched thumb.
Not including Just Watched if thumb isn't there.
Alignment for Just Watched if thumb isn't there.
Merge branch 'hotfix/0.3.3' into develop