fixing font layout and positions
resolved conflicts