Fixed loading bug and item text display
Added and implemented cleanup method