Minor refactoring
Full screen mode integrated