Less padding for the <small> text
Clean up id checks