Changed to fancier button and minor form width changes