Updated layouts slightly