Added buttons, bug fixes.

..