Updates for handling dynamic screen sizes