add modal
restructrure and resize object field