Added local changes merged with Matt's changes to title wrap