Pull Request - Screen Design/Layout

done na po.