Fixed bug #4, tweaked buttons