Refactor gui fluid handler