final GUI changes