Refactor for nicer responsive display