Reserver button functionality
Fixed conflicts and commit result due to merge failure