added default button functionality and minor bug fixes