To the top button [#18]

Also fix some class names