Fix button width, improve json mapping