options per screen, cleaner build