Issue #61 remaining screens