Sticky buttons fix