Refactor drawer thread
various