Some visual adjustements and text improvements