Updated screens  - home and page 2