Fixed a minor issue with the buttons and renamed a package.

Signed-off-by: Matt <duanemat@gmail.com>