Improved how titles are called & added generic btn