Further improvements to button look and fix json support