Btn Fixes and minor framework update

contact form now modal