Updated layouts for compatibility