fixing error
return button
modifications