Change g-body to g-options-container for disambiguation
Remove global var declarations and improve hr detection