Moved screen dimensions to Constants, ++.