Contact form added and code cleanup