GUI updated, but not finished