Label and input markup and styles update