Mobile friendly improvements