Cleaning up mobile version, near finished