improved mobile experience + bugfix