Button fix

Fixed buttons, changed header, tweaked some stuff