Many fixes for mobile & layout + Perf improvements