fixed issues from the theme review tickets