More improvements to add buttons