[TASK] Beautify form