Add description, tweak buttons