changed css font
resolving conflicts
minor css change