Develop merge back

Working player and full screen mode.