cleanup + mobile view fix