fixed render logic
created organization page