Added title helper and some design changes