first two screens finished in code, not in UI
minor changes