Made a few more changes for mobile, getting closer