Added buttons
merged with shiva