Fix for play button centering issue, Performance optimizations