last changes done need to update on font and color