Several fixes with titles and design