Improve client error handling
Button rendering in spark client
Update dist