Small adjustments on form