before remake of layout