fixed fading and buttons