FONT BUG FIXED and minor layout update