fixed: GUI organization