fixed StartWindow on the tablet
refactoring