Updated layouts and logic