Re-worked views, added contact form et al.