Updated to use skeleton layout