Some touchups to the changes

Both main site and mobile