some template fixes (justify + right bar)