[Finish #52588761] Unify layout views -- Done