Mobile friendly bugfixes