better button and form spacing