Refactor html and change buttons and layout a little bit