Made the buttons optional, started on userguide