Made changes to solve responsivenes