Remove class on mobile, and bugfix