updated drawer code