add text information
update text font
add style for phone
update galery
resolve merge conflicts