Adding a return button logic, better penalties.

return button, penalties.. make as final