added cancel button, fixed field caption