Added connection stuff and about/contact
Merge fix