Clean up styles and type, fix links