Added more buttons, fixed some formats, getting there...
Signed-off-by:Craig Russell <tenowg@gmail.com>