Updated layouts application