Improved UX

Fading and such