Refactored, added item drawer