Lot of font work done. Added some layout stuff