Add label and fix css issues