Refactor to be screen-size agnostic