Added new fonts
Change structure for better layout