Refactoring + Fixed bounds for new screen size.