LILY-497: added & changed buttons