Fixed titling issues