Fixed header, updated buttons