Pull Request - Screen Design/Layout

Updated na po.