Fixed the crash and working plus improved drawer list