Added styling and key support