JS update / Buttons and type improvements