final main fix + mobile view