Added more buttons and such.