Some small enhancements & remove old contact page code

fixes #2 
fixes #3 
fixes #5 
fixes #6