Updated config + screens