Added a bit more style and new links
merge