Adding still buggy drawer