removed unecessary form and better button