Fixed line wrapping issue. Working on customizing all themes