Untangle some imports in frontend.
Tighten imports a bit.
Merge pull request #116 from pjonsson/frontend-options

Misc frontend changes.