Final Edits

Complete RL's git issues before posting to theme review.

Signed-off-by: Jack Nycz <jack@southernweb.com>