updated buttons
fixed h2 bug
re arranged code