Improve styling and content again, start adding links