[ ! ] Layout and text improvements