Added a safeguard against missing OMS token (LEV-91)
Visual updates and minor logic tweaks (LEV-86)
Resolved line-ending conflicts