version 2.0

tags no longer needed, button names swapped.