More tweaks and fixes
Prettier top/page transition and other small fixes