put the button in the right place
added some shameful css
fixing merges