re-organized gui