Refactor, change the way it works on desktop browsers