refactor on-top option