completed first two tabs implementation