optimisation and some changes
font changes