core changes + buttons