Changes to make it better at being responsive