Fixing code size and video pause
Layout workarounds