consolidating stuff and better mobile site