Started adding scafolding for dynamic screen size