Added styling and knockout handling