adding contact form and some bugs