More fixes
Removed logging
Not mobile friendly but mobile-usable