Before mobile

No mobile support yet. Few minor fixes