Add: Some more beauty to the forms