Improve forms design