Some tweaks after mobile testing