Updated layout and fixed fonts