updates on title bar
merged with master