Started adding multiple screen size support