Updated to display properly inside larger windows