changed buttons, changed header, more minor changes